Merge git://git.denx.de/u-boot-uniphier
authorTom Rini <[email protected]>
Tue, 9 Jan 2018 13:45:02 +0000 (08:45 -0500)
committerTom Rini <[email protected]>
Tue, 9 Jan 2018 13:45:02 +0000 (08:45 -0500)

Trivial merge